From: Glenn Morris <rgm@gnu.org>
Date: Thu, 3 Mar 2011 08:13:09 +0000 (-0800)
Subject: Merge fix.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~4547
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=5ee377635cea0eff9e0ea01d9f9bc7e00f089159;p=emacs.git

Merge fix.
---

diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog
index 68d957584c6..5f0908e11c6 100644
--- a/lisp/org/ChangeLog
+++ b/lisp/org/ChangeLog
@@ -1,14 +1,3 @@
-2011-02-28  Juanma Barranquero  <lekktu@gmail.com>
-
-	* org.el (org-maybe-keyword-time-regexp):
-	* org-icalendar.el (org-icalendar-store-UID):
-	* org-agenda.el (org-agenda-scheduled-leaders)
-	(org-agenda-deadline-leaders, org-agenda-filter-preset):
-	* org-table.el (org-table-current-line-types)
-	(org-table-current-begin-line, org-table-current-begin-pos):
-	(org-table-current-field-formula):
-	Fix typos in docstrings.
-
 2011-02-10  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* org-remember.el (org-remember-mode-map):